Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 05:07:26 +0000 (21:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 05:07:26 +0000 (21:07 -0800)
commit7890564d5a1211251e209fd9cf375519d8e39c81
treeffc067c3652c57001253207f9e697e720f186854
parent9b68a0707e3f965d2bc9ec2c4cf43c422dfdbd1a
parente10b1d0ed994b6c10b90fa01b355d60957653002
Merge from mainline.
admin/ChangeLog